From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Jan 2010 04:56:20 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~19577
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2d13c8f0682bd38c74e89a76cc550f0324b610ba;p=linux-4.9.git

Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: retry link resume if necessary
  ata_piix: enable 32bit PIO on SATA piix
  sata_promise: don't classify overruns as HSM errors
---

2d13c8f0682bd38c74e89a76cc550f0324b610ba